From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 2 Dec 2005 00:03:15 +0000 (+0000)
Subject: * Fix custom namespaces on wikis set for Portuguese
X-Git-Tag: 1.6.0~1082
X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=a6fb61e7846bbcec90f78c79e4335669bd5bb063;p=lhc%2Fweb%2Fwiklou.git

* Fix custom namespaces on wikis set for Portuguese
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 78c6e7ae2b..c6e72261e5 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -271,6 +271,7 @@ fully support the editing toolbar, but was found to be too confusing.
 * Remove obsolete 'redirect=no' on some edit links
 * Include oldid for the second revision on edit link on diff view
 * (bug 4035) Fix prev/next revision links on edit page
+* Fix custom namespaces on wikis set for Portuguese
 
 
 === Caveats ===
diff --git a/languages/LanguagePt.php b/languages/LanguagePt.php
index 9e5cb50545..1003768947 100644
--- a/languages/LanguagePt.php
+++ b/languages/LanguagePt.php
@@ -55,7 +55,7 @@ if($wgMetaNamespace === FALSE)
 	NS_HELP_TALK        => 'Ajuda_Discussão', # 13
 	NS_CATEGORY         => 'Categoria', # 14
 	NS_CATEGORY_TALK    => 'Categoria_Discussão' # 15
-);
+) + $wgNamespaceNamesEn;
 
 /* private */ $wgQuickbarSettingsPt = array(
 	'Nenhuma', 'Fixo à esquerda', 'Fixo à direita', 'Flutuando à esquerda', 'Flutuando à direita'